Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <[email protected]>
Sat, 2 Jul 2016 02:35:12 +0000 (22:35 -0400)
committerTom Rini <[email protected]>
Sat, 2 Jul 2016 02:35:12 +0000 (22:35 -0400)

Trivial merge